Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove child/parent image support #19283

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

nordicjm
Copy link
Contributor

@nordicjm nordicjm commented Dec 5, 2024

Removes support for this deprecated feature

test_sdk_mcuboot: sdk-nrf-19283
test_rs: PR-1443
test_fem: PR-1443

@nordicjm nordicjm added the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@nordicjm nordicjm added this to the 3.0.0 milestone Dec 5, 2024
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-Requested Approves single commit for CI tests on Internal HW ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. and removed CI-Requested Approves single commit for CI tests on Internal HW labels Dec 5, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 5, 2024

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
matter nrfconnect/sdk-connectedhomeip@20babbe (master) nrfconnect/sdk-connectedhomeip#520 nrfconnect/sdk-connectedhomeip#520/files
mcuboot nrfconnect/[email protected] nrfconnect/sdk-mcuboot#386 nrfconnect/sdk-mcuboot#386/files
zephyr nrfconnect/sdk-zephyr@6d04ddb (main) nrfconnect/sdk-zephyr#2343 nrfconnect/sdk-zephyr#2343/files

DNM label due to: 3 projects with PR revision

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 5, 2024

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 32

Inputs:

Sources:

sdk-nrf: PR head: 05bc31fb2c127f4d711e41a0e3950d2f496a84c0
mcuboot: PR head: a06406487b9042da2669ad87e281d40446fcda18
matter: PR head: 35bd6068fefa7b2326976422200449177e4462e6
zephyr: PR head: cd136d0bbb232d77d8ef693b366609635df8d83d

more details

sdk-nrf:

PR head: 05bc31fb2c127f4d711e41a0e3950d2f496a84c0
merge base: ceb3b15891e10157518a407f8103f7be1f92374f
target head (main): ceb3b15891e10157518a407f8103f7be1f92374f
Diff

mcuboot:

PR head: a06406487b9042da2669ad87e281d40446fcda18
merge base: 12e5ee106034972b0f1074d6f2261b2b39d1501b
target head (main): 12e5ee106034972b0f1074d6f2261b2b39d1501b
Diff

matter:

PR head: 35bd6068fefa7b2326976422200449177e4462e6
merge base: 20babbe7904f55511c39f19cae2162f7b770f974
target head (master): 20babbe7904f55511c39f19cae2162f7b770f974
Diff

zephyr:

PR head: cd136d0bbb232d77d8ef693b366609635df8d83d
merge base: 6d04ddbedbe373b5d2bae3ad7e78ab9329034c4f
target head (main): 6d04ddbedbe373b5d2bae3ad7e78ab9329034c4f
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (119)
CMakeLists.txt
Kconfig.nrf
applications
│  ├── asset_tracker_v2
│  │  ├── boards
│  │  │  ├── native_sim.conf
│  │  │  │ thingy91_nrf9160_ns.conf
│  │  │ prj.conf
│  ├── machine_learning
│  │  │ CMakeLists.txt
│  ├── nrf5340_audio
│  │  ├── Kconfig.defaults
│  │  ├── tools
│  │  │  ├── buildprog
│  │  │  │  ├── buildprog.py
│  │  │  │  │ nrf5340_audio_dk_devices.py
│  ├── nrf_desktop
│  │  │ CMakeLists.txt
boards
│  ├── nordic
│  │  ├── thingy91x
│  │  │  ├── Kconfig.defconfig.nrf5340
│  │  │  ├── Kconfig.defconfig.nrf9151
│  │  │  │ Kconfig.sysbuild
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── bootutil
│  │  │  │  ├── src
│  │  │  │  │  ├── loader_legacy_child_parent.c
│  │  │  │  │  │ swap_priv.h
│  │  │  ├── zephyr
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── include
│  │  │  │  │  ├── sysflash
│  │  │  │  │  │  ├── pm_sysflash_legacy_child_parent.h
│  │  │  │  │  │  │ sysflash.h
│  │  │  │  │ pm.yml
cmake
│  ├── extensions.cmake
│  ├── fw_zip.cmake
│  ├── mesh_dfu_metadata.cmake
│  ├── multi_image.cmake
│  ├── partition_manager.cmake
│  ├── sysbuild
│  │  │ lwm2m_carrier_divided_dfu.cmake
doc
│  ├── nrf
│  │  ├── app_dev
│  │  │  ├── config_and_build
│  │  │  │  │ multi_image.rst
lib
│  ├── edge_impulse
│  │  │ CMakeLists.txt
modules
│  ├── lib
│  │  ├── matter
│  │  │  ├── config
│  │  │  │  ├── nrfconnect
│  │  │  │  │  ├── chip-module
│  │  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │  │ Kconfig
│  ├── mcuboot
│  │  ├── CMakeLists.txt
│  │  ├── Kconfig
│  │  ├── boot
│  │  │  ├── zephyr
│  │  │  │  │ Kconfig
│  │  ├── hooks
│  │  │  │ nrf53_hooks.c
│  ├── trusted-firmware-m
│  │  │ CMakeLists.txt
samples
│  ├── CMakeLists.txt
│  ├── Kconfig
│  ├── bluetooth
│  │  ├── peripheral_uart
│  │  │  │ nrf5340dk_app_sr_net.conf
│  ├── cellular
│  │  ├── lwm2m_client
│  │  │  │ sample.yaml
│  │  ├── nrf_cloud_multi_service
│  │  │  ├── boards
│  │  │  │  │ thingy91_nrf9160_ns.conf
│  │  ├── nrf_cloud_rest_fota
│  │  │  │ prj.conf
│  ├── common
│  │  ├── mcumgr_bt_ota_dfu
│  │  │  │ rpmsg_child_image_overlay.conf
│  ├── mpsl
│  │  ├── timeslot
│  │  │  │ prj.conf
│  ├── peripheral
│  │  ├── radio_test
│  │  │  ├── boards
│  │  │  │  │ nrf5340dk_nrf5340_cpunet.conf
│  ├── tfm
│  │  ├── provisioning_image
│  │  │  ├── Kconfig.sysbuild
│  │  │  ├── boards
│  │  │  │  │ nrf5340dk_nrf5340_cpuapp.conf
│  │  ├── tfm_psa_template
│  │  │  │ prj.conf
scripts
│  ├── bluetooth
│  │  ├── mesh
│  │  │  │ mesh_dfu_metadata.py
subsys
│  ├── CMakeLists.txt
│  ├── bluetooth
│  │  ├── mesh
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  │ hci_ipc_child_image_overlay.conf
│  │  ├── services
│  │  │  ├── fast_pair
│  │  │  │  │ CMakeLists.txt
│  ├── bootloader
│  │  ├── CMakeLists.txt
│  │  ├── Kconfig
│  │  ├── bl_override
│  │  │  │ CMakeLists.txt
│  │  ├── cmake
│  │  │  ├── debug_keys.cmake
│  │  │  ├── provision_hex.cmake
│  │  │  │ sign.cmake
│  │  ├── image
│  │  │  ├── CMakeLists.txt
│  │  │  │ build_s1.conf
│  ├── net
│  │  ├── lib
│  │  │  ├── nrf70_fw_ext
│  │  │  │  │ Kconfig
│  │  │  ├── nrf_cloud
│  │  │  │  ├── Kconfig.nrf_cloud_fota
│  │  │  │  │ Kconfig.nrf_cloud_pgps
│  ├── partition_manager
│  │  ├── CMakeLists.txt
│  │  ├── Kconfig
│  │  │ Kconfig.template.build_strategy
│  ├── zigbee
│  │  ├── lib
│  │  │  ├── zigbee_fota
│  │  │  │  │ Kconfig
sysbuild
│  │ CMakeLists.txt
tests
│  ├── CMakeLists.txt
│  ├── Kconfig
│  ├── drivers
│  │  ├── flash
│  │  │  ├── flash_rpc
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── aci
│  │  │  │  │  │ CMakeLists.txt
│  │  │  │  ├── prj.conf
│  │  │  │  ├── remote
│  │  │  │  │  │ CMakeLists.txt
│  │  │  │  ├── src
│  │  │  │  │  │ main.c
│  │  │  │  ├── sysbuild.conf
│  │  │  │  ├── sysbuild
│  │  │  │  │  │ empty_net_core.conf
│  │  │  │  ├── testcase.yaml
│  │  │  │  ├── zephyr
│  │  │  │  │  │ module.yml
│  ├── modules
│  │  ├── mcuboot
│  │  │  ├── direct_xip
│  │  │  │  ├── child_image
│  │  │  │  │  │ mcuboot.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── external_flash
│  │  │  │  ├── child_image
│  │  │  │  │  ├── mcuboot
│  │  │  │  │  │  ├── boards
│  │  │  │  │  │  │  ├── nrf52840dk_nrf52840.overlay
│  │  │  │  │  │  │  ├── nrf5340dk_nrf5340_cpuapp.conf
│  │  │  │  │  │  │  ├── nrf5340dk_nrf5340_cpuapp.overlay
│  │  │  │  │  │  │  │ thingy53_nrf5340_cpuapp.conf
│  │  │  │  │  │  │ prj.conf
│  │  │  │  │ testcase.yaml
│  ├── nrf5340_audio
│  │  ├── sw_codec_lc3
│  │  │  │ prj.conf
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── mesh
│  │  │  │  ├── metadata_extraction
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │ prj.conf
│  │  ├── bootloader
│  │  │  ├── bl_crypto
│  │  │  │  ├── child_image
│  │  │  │  │  │ mcuboot.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── bl_validation
│  │  │  │  │ prj.conf
│  │  │  ├── bl_validation_ff_key
│  │  │  │  ├── Kconfig
│  │  │  │  ├── prj.conf
│  │  │  │  │ sysbuild.conf
│  │  │  ├── bl_validation_neg
│  │  │  │  │ prj.conf
│  │  ├── event_manager_proxy
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── aci
│  │  │  │  │ CMakeLists.txt
│  │  │  ├── boards
│  │  │  │  ├── nrf5340dk_nrf5340_cpuapp.conf
│  │  │  │  │ nrf5340dk_nrf5340_cpuapp_icmsg.conf
│  │  │  ├── prj.conf
│  │  │  ├── prj_icmsg.conf
│  │  │  ├── zephyr
│  │  │  │  │ module.yml
│  │  ├── fw_info
│  │  │  │ prj.conf
│  │  ├── net
│  │  │  ├── lib
│  │  │  │  ├── nrf_cloud
│  │  │  │  │  ├── fota_common
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ main.c
│  │  ├── partition_manager
│  │  │  ├── static_pm_file
│  │  │  │  │ testcase.yaml
│  │  ├── pcd
│  │  │  ├── child_image
│  │  │  │  │ hello_world.conf
│  │  │  │ testcase.yaml
west.yml
zephyr
│  ├── boards
│  │  ├── nordic
│  │  │  ├── nrf5340dk
│  │  │  │  │ nrf5340dk_nrf5340_cpuapp_ns.yaml
│  │  │  ├── nrf9160dk
│  │  │  │  ├── nrf9160dk_nrf9160_ns_0_14_0.yaml
│  │  │  │  │ nrf9160dk_nrf9160_ns_0_7_0.yaml
│  ├── cmake
│  │  ├── linker
│  │  │  ├── ld
│  │  │  │  │ target.cmake
│  │  ├── modules
│  │  │  │ kconfig.cmake
│  ├── samples
│  │  ├── subsys
│  │  │  ├── usb
│  │  │  │  ├── dfu
│  │  │  │  │  │ sysbuild.conf
│  ├── tests
│  │  ├── drivers
│  │  │  ├── flash
│  │  │  │  ├── common
│  │  │  │  │  │ sysbuild.conf

Outputs:

Toolchain

Version: b77d8c1312
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:b77d8c1312_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
  • ✅ Integration tests
    • ✅ test-sdk-audio
    • ✅ desktop52_verification
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-fw-nrfconnect-apps
    • ✅ test_ble_nrf_config
    • ✅ test-fw-nrfconnect-ble_mesh
    • ✅ test-fw-nrfconnect-ble_samples
    • ✅ test-fw-nrfconnect-chip
    • ✅ test-fw-nrfconnect-nfc
    • ✅ test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • ✅ test-fw-nrfconnect-nrf-iot_samples
    • ✅ test-fw-nrfconnect-nrf-iot_lwm2m
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91
    • ✅ test-fw-nrfconnect-nrf_crypto
    • ✅ test-fw-nrfconnect-rpc
    • ✅ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem
    • ✅ test-fw-nrfconnect-tfm
    • ✅ test-fw-nrfconnect-thread
    • ✅ test-fw-nrfconnect-zigbee
    • ✅ test-sdk-find-my
    • ✅ test-fw-nrfconnect-nrf-iot_mosh
    • ✅ test-fw-nrfconnect-nrf-iot_positioning
    • ✅ test-sdk-sidewalk
    • ✅ test-sdk-wifi
    • ✅ test-low-level
    • ✅ test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • ✅ test-sdk-pmic-samples
    • ✅ test-sdk-mcuboot
    • ✅ test-sdk-dfu
    • ✅ test-fw-nrfconnect-ps
    • ✅ test-secdom-samples-public
    • ⚠️ test-fw-nrfconnect-fw-update
    • ⚠️ test-fw-nrfconnect-nrf-iot_cloud

Note: This message is automatically posted and updated by the CI

@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@nordicjm nordicjm added the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@nordicjm nordicjm added the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@nordicjm nordicjm added the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@nordicjm nordicjm added the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Dec 5, 2024
@nordicjm nordicjm force-pushed the byebyechildparent branch 2 times, most recently from cb3487d to d298017 Compare December 5, 2024 14:46
@nordicjm nordicjm requested review from a team and nordic-auko as code owners December 11, 2024 13:43
Removes support for child/parent image from these repos

Signed-off-by: Jamie McCrae <[email protected]>
Removes support for child/parent image

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
Copy link
Contributor Author

@tejlmand @nrfconnect/ncs-nrf-cloud @nrfconnect/ncs-si-muffin @nrfconnect/ncs-audio @nrfconnect/ncs-aegir @nrfconnect/ncs-dragoon @nrfconnect/ncs-si-bluebagel @nrfconnect/ncs-co-networking @nrfconnect/ncs-iot-oulu @nrfconnect/ncs-doc-leads @nrfconnect/ncs-vestavind-doc @nrfconnect/ncs-cia please review

Comment on lines 340 to 342
The listing below describes how to leverage this functionality, where ``ACI_NAME`` is the name of the child image to which the configuration will be applied.

.. literalinclude:: ../../../../cmake/multi_image.cmake
:language: c
:start-at: It is possible for a sample to use a custom set of Kconfig fragments for a
:end-before: set(ACI_CONF_DIR ${config_dir}/child_image)

When you are using :ref:`app_build_additions_build_types` and the configuration name has been inferred, the child image Kconfig overlay file is searched at :file:`child_image/<ACI_NAME>_<name>.conf`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the entire page or remove it, given the note at the top of the page.

Other pages that need to be updated:

  • config_and_build_system.rst - sections "Child images" and "Multi-image builds"
  • multi_image_nrf5340.rst - entire page needs to be reviewed or removed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am deferring this to another PR as the changes are quite extensive and it's going to take a bit of time and a lot of CI attempts to get the doc build to actually work, the change here is just for the build systems parts. Can see the doc changes in this branch here: main...nordicjm:sdk-nrf:byebyechildparent_doc which does not build documentation successfully which is why I removed it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-force-downstream DNM doc-required PR must not be merged without tech writer approval. manifest manifest-matter manifest-mcuboot manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.